ostbuild: Drop "commit-artifacts" builtin

It's long since dead.

diff --git a/Makefile-ostbuild.am b/Makefile-ostbuild.am
index 6857b617c5af9a6c1fa15fbda42979f8265cb854..b64aa07ee270e311c3a73c9ed442e3e17592ab77 100644 (file)
--- a/Makefile-ostbuild.am
+++ b/Makefile-ostbuild.am
@@ -26,7 +26,6 @@ pyostbuild_PYTHON =                                   \
        src/ostbuild/pyostbuild/builtin_checkout.py     \
        src/ostbuild/pyostbuild/builtin_chroot_compile_one.py   \
        src/ostbuild/pyostbuild/builtin_chroot_run_triggers.py  \
-       src/ostbuild/pyostbuild/builtin_commit_artifacts.py     \
        src/ostbuild/pyostbuild/builtin_compile_one.py  \
        src/ostbuild/pyostbuild/builtin_resolve.py      \
        src/ostbuild/pyostbuild/builtin_status.py       \

diff --git a/src/ostbuild/pyostbuild/builtin_commit_artifacts.py b/src/ostbuild/pyostbuild/builtin_commit_artifacts.py
deleted file mode 100644 (file)
index 6f6f63c..0000000
--- a/src/ostbuild/pyostbuild/builtin_commit_artifacts.py
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/usr/bin/python
-
-# Copyright (C) 2011 Colin Walters <walters@verbum.org>
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
-# ostbuild-compile-one-make wraps systems that implement the GNOME build API:
-# http://people.gnome.org/~walters/docs/build-api.txt
-
-import os,sys,subprocess,tempfile,re
-import argparse
-
-from . import builtins
-from .ostbuildlog import log, fatal
-from .subprocess_helpers import run_sync
-from . import buildutil
-
-class OstbuildCommitArtifacts(builtins.Builtin):
-    name = "commit-artifacts"
-    short_description = "Commit artifacts to their corresponding repository branches"
-
-    def execute(self, argv):
-
-        parser = argparse.ArgumentParser(self.short_description)
-        parser.add_argument('--repo')
-        parser.add_argument('artifacts', nargs='+')
-
-        args = parser.parse_args(argv)
-
-        if args.repo is None:
-            fatal("--repo must be specified")
-
-        for arg in args.artifacts:
-            basename = os.path.basename(arg)
-            parsed = buildutil.parse_artifact_name(basename)
-    
-            branch_name = buildutil.branch_name_for_artifact(parsed)
-
-            run_sync(['ostree', '--repo=' + args.repo,
-                      'commit', '-b', branch_name, '-s', 'Build ' + parsed['version'],
-                     '--add-metadata-string=ostbuild-buildroot-version=' + parsed['buildroot_version'],
-                     '--add-metadata-string=ostbuild-artifact-version=' + parsed['version'],
-                     '--skip-if-unchanged', '--tar-autocreate-parents', '--tree=tar=' + arg])
-                     
-builtins.register(OstbuildCommitArtifacts)

diff --git a/src/ostbuild/pyostbuild/main.py b/src/ostbuild/pyostbuild/main.py
index a20aafe730b0815616c34bb6ee04f191e323cb9a..81b029c5caeaab88845dc5fffe4ee1372f411cf0 100755 (executable)
--- a/src/ostbuild/pyostbuild/main.py
+++ b/src/ostbuild/pyostbuild/main.py
@@ -26,7 +26,6 @@ from . import builtin_build
 from . import builtin_checkout
 from . import builtin_chroot_compile_one
 from . import builtin_chroot_run_triggers
-from . import builtin_commit_artifacts
 from . import builtin_compile_one
 from . import builtin_resolve
 from . import builtin_status